-
Notifications
You must be signed in to change notification settings - Fork 345
fix(reader): Support both position and equality delete files on the same FileScanTask #1778
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
+116
−1
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
hi, @mbutrovich please help to resolve conflicts. |
# Conflicts: # crates/iceberg/src/arrow/caching_delete_file_loader.rs
Done. Thank you for your help with reviewing! |
mbutrovich
added a commit
to mbutrovich/iceberg-rust
that referenced
this pull request
Nov 4, 2025
13 tasks
liurenjie1024
approved these changes
Nov 5, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What issue does this PR close?
Partially address #1749.
Rationale for this change
This PR fixes a bug in delete file loading when a
FileScanTaskcontains both positional and equality delete files. We hit this when running Iceberg Java test suite via Comet in apache/datafusion-comet#2528. The tests that failed wereThe Bug:
The condition in
try_start_eq_del_load(delete_filter.rs:71-73) was inverted. It returnedNonewhen the equality delete file was not in the cache, causing the loader to skip loading it. Whenbuild_equality_delete_predicatewas later called, it would fail with "Missing predicate for equality delete file".What changes are included in this PR?
The Fix:
Nonewhen the file is already in the cache (being loaded or loaded), preventing duplicate work across concurrent tasksAdditional Changes:
test_load_deletes_with_mixed_typesthat reproduces the bug scenarioAre these changes tested?
Yes, this PR includes a new unit test
test_load_deletes_with_mixed_typesthat:FileScanTaskwith both a positional delete file and an equality delete fileload_deletessuccessfully processes both typesbuild_equality_delete_predicatesucceeds without the "Missing predicate" errorThe test would fail before this fix and passes after.